CONFLICT SOLUTION AFTER MERGE
IMPROVED PARSING AND MANUAL MODIFICATION