Merge official repository with local