Added magic func
conflict resolved func updated