Remove conflict stuff from merge of fork