Make compile after merge