Fixed merge with encryption and development