fixed some p left in controller
Resolving second merge conflict