got rid of half written
dealt with conflicts