okay version
fix merges