Question & answer posting done to database
Conflict resolved
Conflict resolved