monday morning scripts/likes controller merge conflict resolution