Commit after fixing merge errors