Removed merge conflit leftovers