monkeying around with merged files fixing issues from merge