merge changes from home