changed name of the project
fixed issue with merge