Abstract class modification
solved conflicts