exit with code 1 on build error
resolve merge conflict