forced to commit
resolving merge conflicts