Fixed bug after merge branchs in Client.pri