Removed Confilcts