new stuff!!
solved conflicts