Add simple merge functionality

True merges are not supported yet.