manual merging isn't fun at all ._.