clean project
merge conflict resolved