commit after solved conflict