removed errors due to merge conflict