Finished merging code.