cleans up a bit more
solves merge conflict