Fixed merge confilicts