Added info on resolving merge conflicts