project initialized
merge conflict fixed