merging  branches in a half ass way