GitHub conflicts resolved