merging from remote and updating test