cleaning up
merge conflict and cleaning up