resolving merge issues