Fix merge errors

Fix Merge Errors