merging from repo