Just Check your properties file because of some changes in code properties files also updates seems u forgot to merge in your local from remote properties file.