make better looking
fix merge