added and merged