fixing merge
amending previous commit