merge conflicts removed