Adde files and changes to style
solved conflicts