merge with main project