Testing no fast forward mode, will it ask me to solve the conflict instead
of choosing the newest file?