[Fixing] Fixed conflicts

@AmrARaouf