Base conflicts resolved