fixing pull
merging