Changed to inline
merge