trying but failing to merge