changed trick to be an ordinary controller (not an array controller)
resolved conflicts