rev1
first comit
fix conflicts