Rolling back files till the merge works