Removed git merge stuffz