Added stack
Fixed conflict