Fixed a bug from resolving merge conflict