steadily learning to use merge :/