fixed merge after build