Tried to Reslove Merge Conflict