Fixed merging error from last few pulls