Fixed merge conlflict