resolve gem merge conflicts