Fixed error from merge conflict