Merged in changes and fixed merge conflict.