Merged 2 project versions