Resolved merge conflits (#33)

Author: sunil-lakshman

changelog.rst

@@ -9,7 +9,7 @@
 Bug Fix: Fixed Link type attributes.
 
 - Fixed link type attribute issue
-
+=======
 
 *v1.3.0*
 ============