Whats the best approach to handling merge issues during deployment? Maybe talk with Nahuel might be the way here.