gq
resolved conflict