weird merge problem, ignore commit