Resolving merge issues