Resolve merge conflict/clean up clean up attempt