create saving data
fix conflicts