remove stray conflict marker and module import