Resolve Conflict from MasterBranch