Move conflicts field to the correct section