fixed commit conflicts removed