Add volume binding
Fix merge