F editing merge conflicts

edited winning condition