Commit 54

Fixed merge renaming