Hopefully removed all damage done by commits without merge