Fixed some errors created by a merge conflict.