Resolving merge@