include conflicts resolved