fix pound thingy
fix merge conflict