changes :O
merge fixed