no fast forward while merging