resolve merge conflict
install simple form gem
add form to create patient