Merge Code Confict fixes