Editing files

- Fixed few merge bugs