fixed wording
fix conflicts
add pg