fix merge conflicts
fix merge
add beautiful green