Integrate local changes into git