made it better
fix merge conflict