removed all conflict merge data and applied fixes