Artit 20140612

Fix code conflicting