OK i guess this means that this method becomes a little more complicated. could you handle merging and push it?