Merge and Fixed