Changed project name
resolving conflict, adding theirs