style
fixing commit
fixed major conflicts