made changes due to syncing prob in git