testing several git complicated merges