merging works. committing doesn't?