Bug fixes(sort of)
merge conflict