removed git conflict shit from posts controller