Fixed merge confilcts