Fixed some merge conflict. -Sai