Fixed problem  merge git