- Fixed short php tags from merge
- removed accidentally included merge tags