FINAL MERGE CONFLICT SOLUTION