fixed you broken merge smartgit