fix weird merger stuff