changed lots lol by OminStyle
fixed conflicts by ominstyle