add missing file
fix conflicts