Almost lost everything trying to merge :/