Fixes project merge