Fixed merge conflict removing funciton def