Fix merge for build