add address
resolve merge conflict
readded missing posts_controller