github conflict resolved