Starting merge with main project