Challenges of Resolving Merge Conflicts: A Mining and Survey Study