clean up the merge again..