edit post, unsure best practice
fix merge