do not commit merge marks