push after mapping of question and answers
resolve conflicts after pull