coins added
merge fixed