Beam's last commit
Fixed conflicts