MERGE CONFLICTS FOR MARK