merged everyones stuff