Same changes between local and remote branch

This commit is for learning to solve merge conflicts