Merge changes from main repository