conflict issues
only required files