merged into new commit
fixed - merge