Solved conflicted on default.ctp