Fixed merge conflict.
Updated beta version to 3.4.1.