Fixed conflicts in Customer class

Maybe..