cleaning
new mockup
fixed confilcits