Merge changes during development