Fixes leftovers from merge conflict