fix merge bug -> duplicate comment form inclusion