added ajax to comments
fixed conflicts
fixed comments