Items can be Edited via model page
Fixed COnflicts