Added GitMergeAction.inMergePhase. Objects are only highlighted if it is true to prevent highlighting on automatically merged objects. Resolves #20.