removed defaults on comment model
resolved conflicts