got rid of some merge garabage