Resolving merge conflicts with drops chat