Adding status report.
More merging failures.
Adding fixed merge files
Adding fixed merge files