merge confilcts fix 1