Extending classes
Merging comnflicts