re-fixing things i cant mege properly