Fixed a conflict free version of version 3