fixes to get rid of merge errors