Merge changes into my working