transfering changes from fork