cleaned up conflicts

cleaned up conflicts