conflicts removed!