Re-added the files after a merge conflict.