cleaning up after messy merge