model logic working
merges fixed