Synced and fixed merge conflicts