Fixing project and merging