EMSE journal paper "The Life-Cycle of Merge Conflicts: Processes, Barriers, and Strategies" (Accepted)