pressure makes coal
fixing the merge