fixed your problems
mandatory merge