merge now functioning