removed formatting issues
merge conflict