Removed compiler & linter warnings
Fixed merge conflicts