Cleaned-up previous failed merging