locally renaming y variable to a
merging origin with master