fixing merge conflict
finalising merge conflict