Resolving merge conflics