compile after merge